From 7b6b3c77862be33ec6a60ce977e79124cd6c93df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 18 Mar 2017 12:54:33 +0000 Subject: [PATCH] meson: gsk: use gnome.mkenums() to generate enum types --- gsk/meson.build | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/gsk/meson.build b/gsk/meson.build index 3605112258..b19cb07510 100644 --- a/gsk/meson.build +++ b/gsk/meson.build @@ -127,18 +127,14 @@ gsk_resources_xml = configure_file(output : 'gsk.resources.xml', # FIXME: do we need this variable? gsk_sources = gsk_public_sources + gsk_private_sources -gskenum_h = custom_target( - 'gskenum_h', - output : 'gskenumtypes.h', - input : gsk_public_headers, - command : [mkenum, perl, glib_mkenums, meson.current_source_dir() + '/gskenumtypes.h.template', '@OUTPUT@', '@INPUT@']) - -gskenum_c = custom_target( - 'gskenum_c', - output : 'gskenumtypes.c', - input : gsk_public_headers, - depends : gskenum_h, - command : [mkenum, perl, glib_mkenums, meson.current_source_dir() + '/gskenumtypes.c.template', '@OUTPUT@', '@INPUT@']) +gsk_enums = gnome.mkenums('gskenumtypes', + sources: gsk_public_headers, + c_template : 'gskenumtypes.c.template', + h_template : 'gskenumtypes.h.template', + install_dir : 'gtk-4.0/gsk', + install_header : true) + +gskenum_h = gsk_enums[1] gskresources = gnome.compile_resources('gskresources', gsk_resources_xml, @@ -155,9 +151,8 @@ gsk_deps = [ libgdk_dep, ] -libgsk = static_library( - 'gsk', - sources: [gsk_sources, gskenum_h, gskresources], +libgsk = static_library('gsk', + sources: [gsk_sources, gsk_enums, gskresources], dependencies: gsk_deps, include_directories: [confinc], c_args: ['-DGSK_COMPILATION', '-DG_LOG_DOMAIN="Gsk"'], -- 2.30.2